tree b9b66071b0dc06a9a7c649447275798db197c8b0
parent 2f398ff11c7657d7302bc7f8d1dc8ebb6adeff5c
parent db6aa0b907ddab49d06dad67a664c786b3026dd1
author android-build-team Robot <android-build-team-robot@google.com> 1497633859 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497633859 +0000

Merge cherrypicks of [2419750, 2419599, 2419638, 2419698, 2419640, 2419699, 2419728, 2419801, 2419821, 2419763, 2419753, 2419600, 2419802, 2419783, 2419841, 2419822, 2419676, 2419754, 2419764, 2419729, 2419700, 2419765, 2419823, 2419730, 2419824, 2419755, 2419715, 2419716, 2419733, 2419829, 2419869, 2419870, 2419805, 2419871, 2419786] into nyc-mr2-security-a-release

Change-Id: Ie8301d257a1ea7a4a13ee9b05982f6ae14d384f1