tree 88b666c4503639da9c238ea554c9113873a3b846
parent 165d2265ddf604c8e64424532709c4e647af5d0f
parent 93d36fa09750a511d5429b780325024ef930dc03
author android-build-team Robot <android-build-team-robot@google.com> 1501882183 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501882183 +0000

Merge cherrypicks of [2666762] into nyc-mr1-volantis-release

Change-Id: I10b4e63bf5043b7bfdb3cd35665fae68381a50f4