Test: m Bug: 128803828 Change-Id: I3818eb8abb5a410663a6da633d5516cef4ecad8e (cherry picked from commit 45ff048d)