bug: 28537115 Change-Id: I6a34d8c59d5a79b58c4a95fe99ca73b5959949ae (cherry picked from commit e5dfd08c)