Bug: 31353457 Test: mma Merged-In: I5c9a2cd3e692dbdf52c4f29cf4913495af046ac9 Change-Id: I5c9a2cd3e692dbdf52c4f29cf4913495af046ac9 (cherry picked from commit 8505cad54ba91728a347306e25120dbb221a4c48)