tree 6ea1fa6a0a33091d2056c90a02b128a3a0a2fae6
parent c2fe20e2a762bb80539c3f6f0abce9426e0ace49
parent fdd4a9ee8a6053efb3f0180b1a95e6d7f315d15d
author android-build-team Robot <android-build-team-robot@google.com> 1496780556 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1496780556 +0000

Merge cherrypicks of [2364823, 2364731] into nyc-mr2-release

Change-Id: I071d4cdb59b3a54bfb57c868a8b47592e3648f31