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 'c4cd2217d3591dd692c9c26a6779c51d7271f80b':
  Cherrypick to jb-dev https://android-review.googlesource.com/61031