am 1007a8dc: Merge "Fix issue 3022800." into gingerbread

Merge commit '1007a8dc48b2f00942d1d7520aa9e82ee330676e' into gingerbread-plus-aosp

* commit '1007a8dc48b2f00942d1d7520aa9e82ee330676e':
  Fix issue 3022800.