tree 9bcd4b8f6dddbad7c03552bda63879caa13981fa
parent 1225b4819b12a1c5839d63a994774dd6615b03d2
parent fbf7218c5462372dc51c69cd231d710e9e13d1c9
author android-build-team Robot <android-build-team-robot@google.com> 1501113424 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501113424 +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: I4fb87cab3b21d075a77f54cbac94a57fe3080f25