tree ac964c4955325d3a42d1735604ddb650863d8db0
parent e8847a53467937c182848f7ba7d6a7416d3905e4
parent 294f3a2e834a171e0c50fe34c6fecb84cbc18da6
author android-build-team Robot <android-build-team-robot@google.com> 1505334777 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505334777 +0000

Merge cherrypicks of [2891229, 2891249, 2891250, 2890684, 2890685, 2891070, 2891071, 2891269, 2891072, 2891073, 2891074, 2891075, 2891077, 2891079, 2891081, 2890238, 2890239, 2891231, 2891088, 2891349, 2891350, 2890242] into nyc-mr1-security-a-release

Change-Id: I28fdc87d57acf82e73fd065fbc9fb138c56e8528