Bug: 28177406 Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b (cherry picked from commit c242fa6b)