Bug: 124701288 Test: robolectric, manual Change-Id: Iea446ae600d22ed62c5ee45afd1cd27a89b5de34
Test: rebuild Change-Id: Ifd105a91be4ce3b3ae35766e069d4b4663e54b0f