tree 0f087f2d41f5d1fdc3495e1c2ef95a88d6fb733e
parent 26c543465e920c18c75f52498aa7eb936f7100c4
parent 7472411642e541f54e7314094a64ccc1fbccd984
author android-build-team Robot <android-build-team-robot@google.com> 1501262764 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501262764 +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: I736152649518f72007b8b66ef088841aa2b159ab