tree a7eb22a7a4665ae722a26d3c46b330202b6a1e27
parent 513ef16a59313ee7f98718bfdaca23fc44cf3c4f
parent be40c364ab6093c9a8c3a87adb839badf85a3f74
author android-build-team Robot <android-build-team-robot@google.com> 1496255636 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1496255636 +0000

Merge cherrypicks of [2337578, 2337519] into nyc-mr1-volantis-release

Change-Id: I22f480767c9ca79bae703a24455b3c494115304b