Bug: 28256882 (cherry picked from commit 9152fed6) Change-Id: I804e45c8c6a7bc97fcec5a380ccc1bdf70de8b00