bug: 28192631 (cherry picked from commit 5b2cfd8b) Change-Id: Ifc1d89d728c406956efb48b46d73ace0835c8ff1