tree cc8eb64727b050caef42faa7d8b2fd8250d2ecd8
parent a4327f0516fbff3b2804482cb38e2cad52422dac
parent 1e904fa64c5048938b5f54870eee1244aca73896
author android-build-team Robot <android-build-team-robot@google.com> 1495734765 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1495734765 +0000

Merge cherrypicks of [2315763, 2315554, 2315573, 2315765, 2315712, 2315595, 2315713, 2315746, 2315786, 2315799, 2315576, 2315800, 2315673, 2315821, 2315578, 2315597, 2315633, 2315598, 2315769, 2315716, 2315634, 2315823, 2315801, 2315636, 2315717, 2315772, 2315753, 2315803, 2315638, 2315840, 2315841, 2315842, 2315824, 2315791, 2315879, 2315804, 2315827, 2315863, 2315792, 2315864, 2315755, 2315882, 2315756, 2315828, 2315793, 2315865, 2315883, 2315899, 2315885, 2315796, 2315869, 2315923, 2315924, 2315943] into nyc-mr1-security-e-release

Change-Id: I72e87af11b5aa5ce13108e9edbfb742579fd93bc