am 2adbc7f7: Backport l53e91db7 from master.

Merge commit '2adbc7f7a4a4a827360f8a585e7306f07f2fd718' into eclair-plus-aosp

* commit '2adbc7f7a4a4a827360f8a585e7306f07f2fd718':
  Backport l53e91db7 from master.