Bug: 14298175 (cherry picked from commit aefe55f0) Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198