tree de38e07982d873ff4f3408f14e14f5b14024dbe6
parent f5889c6e4475d3d35784b449310463d7b8713200
parent 83d98e42db21e2469f7d80bad93022cd5cd9d153
author android-build-team Robot <android-build-team-robot@google.com> 1510206283 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1510206283 +0000

Merge cherrypicks of [3196053, 3195996, 3195997, 3195998, 3196073, 3196093, 3196113, 3195934, 3195999, 3196074, 3196133, 3196134, 3195914, 3195915, 3195916] into oc-mr1-release

Change-Id: I2dbbcea69c81076996c938945a8aa38562ad8741