tree 201b279c53cf204ee50e7c4ec602cfa660b39236
parent b9120288f2036ab5590049f1d16de5d87ad8a0f5
parent c307f5aca666e8ace809a03fdb956c3ec07aa570
author android-build-team Robot <android-build-team-robot@google.com> 1516304584 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1516304584 +0000

Merge cherrypicks of [3478016, 3477857, 3477909, 3478630, 3478631, 3478556, 3478557, 3477761, 3477762, 3477763, 3478043, 3478044, 3478045, 3478441, 3478442, 3478443, 3478018, 3478558, 3478559, 3478560, 3478561, 3478562, 3478563, 3478564, 3478565, 3478566, 3478567, 3478568, 3478569] into oc-m5-release

Change-Id: I12027823e17067c21793985812d561f842ccfeac