BUG: 35606429 Test: manual Change-Id: I7687d664c928de2325d50c3e9e7912f10aa37463 Merged-In: Ib1f5ee5f793f53901ad54bb6b6d4cb667dc720ab