tree 80bdf8d2383fcaa6bb75018f904ab601ac5fe897
parent 67e00fc930165af628d42a569622e7ac66a9ef6a
parent 5d3ae1c9564780ec98b6378c90528b002c0b9e54
author android-build-team Robot <android-build-team-robot@google.com> 1501262820 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501262820 +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: I203bfc4f8aa1a01172b92b63b17f9c8376481ce2