Bug: 28603175 Bug: 28684584 (cherry picked from commit 3ea5a97d) Change-Id: I7f1bd22e7710cca74f4b10fd13cb8fa2c3b1b318