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

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