tree 3bab695264c9bc0abbe530e21f382e001837d344
parent 77cb7cfd1ab3bdacf35d4a0c8d4708410b205a3d
parent b7f74b73eb46eff08c17e8e84133f5f224228c21
author android-build-team Robot <android-build-team-robot@google.com> 1501262827 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501262827 +0000

Merge cherrypicks of [2622852, 2622193, 2622194, 2622195, 2622933, 2622990, 2622991, 2622992, 2622993, 2622994, 2622995, 2622934, 2622196, 2622975, 2622996, 2622997, 2622998, 2623050, 2622935, 2622197, 2623051, 2622936, 2622918, 2622919, 2622999] into oc-release

Change-Id: I797b38442045e5165db55d70617201e8338bc5cc