bug:21869678 (cherry picked from commit afd06414) Change-Id: I982ccdf46e3f4d0cc1901439e0bc2dcfa0fc661f