Test: none Bug: 153921802 Change-Id: I0651e7fa2a705b553f2d24ca573936c28591bb84 Merged-In: I552b3bf8d79c4e4480396edc201b51ec5901b87b (cherry picked from commit 7f210a41827742b1448a82d093a651898f40ad2e)