tree b85a5134b887b804478c2a595f203a2340fc1f4d
parent dd790de419425b399f39ccbf2df6af353f2e6d27
parent 7c4c7fa208e31dc6f355a4488f267122015730a3
author android-build-team Robot <android-build-team-robot@google.com> 1501696476 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501696476 +0000

Merge cherrypicks of [2647454, 2647904, 2647905, 2647455, 2648036, 2648037, 2648038, 2648039, 2648040, 2648041, 2648042, 2647918, 2647429, 2647906, 2647907, 2647951, 2647952, 2647953, 2647954, 2647955, 2648056, 2648057, 2648058, 2648059, 2648060, 2648061, 2648062, 2648063, 2648064, 2647919, 2648065, 2647908, 2648049, 2647909, 2647910, 2648066, 2648050, 2647430, 2647431, 2647432, 2647433, 2647434, 2647435, 2648076, 2648051] into nyc-mr1-security-e-release

Change-Id: Ieeda318d2c010c6b10c1946e98f876a4933383f0