Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project authored
Change-Id: Ife432dd46cf79868d756070fffa7c8f7db9bf1dd
05037c4c