tree a27cb9cc5dcbf8f915009cf9b0d5081ec4722049
parent 288f1e6c900f2a5e38f9cd6409b20a1754a4bfb9
parent 9fb6ea43934f16cc395b71814b4a1c574ec37f4b
author android-build-team Robot <android-build-team-robot@google.com> 1515535463 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1515535463 +0000

Merge cherrypicks of [3436310, 3434392, 3435998, 3435077, 3435273, 3436350, 3434393, 3434394, 3434395, 3434696, 3435999, 3434352, 3434353, 3434354, 3435080, 3436041, 3434355, 3435813, 3435082, 3435084, 3434396, 3434397, 3436061, 3436000] into oc-m2-release

Change-Id: I25d7319701422f302c4e8f8dbb97e0c4f9c86318