tree 6aac07129e4de7671323679d4ceedc9cb057f503
parent c379b32f4923539d8d227ed96b9bb5f6be6d8c16
parent 418d6e324566197ade83b2717cdbae4ed73937b7
author android-build-team Robot <android-build-team-robot@google.com> 1501262745 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501262745 +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: I89bf7b4c5c90c09ed87de04b0433cdcab101440c