tree ed39557debb04047f94a4e475dbbb06a639bdf57
parent f6a78079a81a177a3edebc9980829cbf39bf6655
parent 2702d25ffc6f74c61ed0de23a0ec093de5239367
author android-build-team Robot <android-build-team-robot@google.com> 1506027716 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506027716 +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: Icde73ed6f769e695bca888a1ec1104b5999919c5