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

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