am 34716a89: Reconcile with jb-mr2-release - do not merge
* commit '34716a89e247aff6853122472a09762eed4a2fc6':
This commit is contained in:
committed by
Android Git Automerger
commit
de272d2a9d