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

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