Test: m Bug: 64382372 Merged-In: Ief4d0596eeff7ed711556b2a23165871d6e06ac3 Change-Id: Ief4d0596eeff7ed711556b2a23165871d6e06ac3 (cherry picked from commit 6d6012ec)