am 643f0f19: am 2ff6a3b0: Cherrypick to jb-dev https://android-review.googlesource.com/61031

* commit '643f0f1964c9e6d1e6ecc7750386a4ae08b4b591':
  Cherrypick to jb-dev https://android-review.googlesource.com/61031