tree ed39557debb04047f94a4e475dbbb06a639bdf57
parent f6a78079a81a177a3edebc9980829cbf39bf6655
parent 95786baa9904d5d05ecf0fc4c8ab46fd32a0d4db
author android-build-team Robot <android-build-team-robot@google.com> 1506122483 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506122483 +0000

Merge cherrypicks of [2947251, 2947338, 2947252, 2947253, 2946095, 2946096, 2946097, 2946098, 2947211, 2947212, 2947254, 2947255, 2947256, 2947257, 2947258, 2947349, 2947350, 2947351, 2947352, 2947353, 2946976, 2946977, 2946978, 2946979, 2946980, 2947354, 2947355, 2947435, 2947356, 2947357, 2947358, 2947359, 2947360, 2947418, 2947421, 2947422, 2947306] into oc-r3-release

Change-Id: I971c4dc8a1c044b6d496bfdfd8082d8b26785734