Reconcile with jb-mr0-release - do not merge
The Android Open Source Project authored
Change-Id: I96a076254209becd703d8a61d027bd41527f58fa
4124016a