tree b85a5134b887b804478c2a595f203a2340fc1f4d
parent 3bbdef241a5911661e58a17c9eff1e7525b0fb8d
parent 89a1edc9f8c6417d2d52b9ede32be5cc822ea80a
author android-build-team Robot <android-build-team-robot@google.com> 1501113398 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501113398 +0000

Merge cherrypicks of [2606653, 2606627, 2606628, 2606654, 2606629, 2606656, 2606890, 2606657, 2606891, 2606658, 2606892, 2606660, 2606661, 2606662, 2606663, 2606893, 2606894, 2606666, 2606667, 2606668, 2606896, 2606898, 2606899, 2606900, 2606901, 2606669, 2606902, 2606904, 2606930, 2606931, 2606906, 2606907, 2606908, 2606970, 2606933, 2606934, 2606935, 2606936, 2606972, 2606973, 2606974, 2606937, 2606976, 2606977] into nyc-mr1-security-a-release

Change-Id: I3b01ca9747e93d492af0d862c4970b33189a2c12