Bug: 28787733 (cherry-picked from commit 7c8aa835) Change-Id: Iea55486c4b95ee16e1f19c8ba2d24c18b9100c97