Bug: 25004154 Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc (cherry picked from commit 4701a496a5)
4701a496a5