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

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