Bug: 21886894 (cherry picked from commit 414000ec) Change-Id: Iafc32f0e45d26f3aaa2d521b98353e7cede16c6f