tree 3cd0c0447d93d8497dbd37c8a43f08984a7af2a2
parent 42d0667c01dd4110745e7baa229be651ee68e635
parent 7712497fd51a9f725846313717879ff588f3bf4a
author android-build-team Robot <android-build-team-robot@google.com> 1506122487 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506122487 +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: I0e7cd0ea440fb68a40cc19887ba52cccfd42ca39