Bug: 21034044 (cherry picked from commit 45d68f13) Change-Id: I7f382a3124955eff5c0b96ca39ec67fb658fa3d0