tree 0c559af39c0f2f2768a5644cbddbddc53de10c6c
parent 6917f02b5c797eb1e7ba7e8f2ae54456df96baa4
parent 85fd8803bf40960413ff0348f698b61b464a653e
author android-build-team Robot <android-build-team-robot@google.com> 1501262749 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501262749 +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: Ia1ce9527c18d0611f4bcb75043eadae2c742fc20