tree 9a4d013115c48b035bf91265cece9bfadc65e835
parent 9d5ee26794cda2319806a4b2e82b91f2d60bdeab
parent 86ba6a6d4324757b00b4c8f8ca8434b4d2ee475f
author android-build-team Robot <android-build-team-robot@google.com> 1495736464 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1495736464 +0000

Merge cherrypicks of [2315914, 2315916, 2315837, 2315963, 2315918, 2315814, 2315983, 2315964, 2316107, 2316086, 2316109, 2315977, 2316145, 2316016, 2316110, 2316221, 2316088, 2316210, 2316242, 2316222, 2316075, 2316076, 2316077, 2316089, 2316243, 2316183, 2316078, 2316112, 2316211, 2316149, 2316113, 2316212, 2316151, 2316215, 2316131, 2316115, 2316245, 2316216, 2316116, 2316217, 2316279, 2316186, 2316187, 2316246, 2316247, 2316249, 2316218, 2316092, 2316094, 2316323, 2316360, 2316379] into nyc-mr1-security-a-release

Change-Id: Id49bfa278df85f38c908de51d3dc1348b57920a9