Bug: 169758206 Test: manual Change-Id: I98ac9eecd8a497541d9ce0761920db1252eb72e0 Merged-In: I98ac9eecd8a497541d9ce0761920db1252eb72e0 (cherry picked from commit 2268cafb)