tree 8e7152298c08a438a3650faea3822f32c57de3f7
parent 2ad25e21f5f3396190b02b9fe6d965c1ac7b2f33
parent 99399557aee36aebe0ef87b3236629a87d092637
author android-build-team Robot <android-build-team-robot@google.com> 1497998560 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497998560 +0000

Merge cherrypicks of [2435782, 2435615, 2435577, 2435653, 2435616, 2435708, 2435617, 2435558, 2435784, 2435709, 2435631, 2435559, 2435560, 2435618, 2435801, 2435674, 2435710, 2435746, 2435579, 2435747, 2435711, 2435785, 2435786, 2435787, 2435713, 2435804, 2435822, 2435842, 2435753, 2435965, 2436024, 2435885] into nyc-mr1-security-e-release

Change-Id: Iae6482309778021eabb5e8ec4234e02d6cb2a788