Test: None Bug: 129551907 Change-Id: I1d2bd44a2a70c8edc45e4af1dd51f72bf818b9a2
mentioned in commit c8a29403