tree 7cd91d500eefaad7aa1605cf9c30cc3376ce4a27
parent 63938acd89145afaf19c7d96a19ca89f3a085b7c
parent 00790382a9ea242317f0e9bd0e9af5809ddfc048
author android-build-team Robot <android-build-team-robot@google.com> 1506027746 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506027746 +0000

Merge cherrypicks of [2938809, 2937688, 2938829, 2938790, 2938791, 2938792, 2938793, 2938849, 2938850, 2938737, 2938738, 2938739, 2938740, 2938741, 2938204, 2938205, 2938206, 2938207, 2938208, 2938830, 2938831, 2938832, 2938794, 2937966, 2938889, 2938810, 2938833] into oc-r5-release

Change-Id: I78b031753a57edad0e1e498530202e90bb19dc04