Bug: 28814718 (cherry picked from commit 0233a413) Change-Id: I709fc30147047c7a420cd6ff2f0c3b57c54c2021