tree 71bbcd4260b47d1d2f6428741da06a09c7e360e9
parent 9ac842a753ebd0b228fe31a81671ff60c23fe1e7
author Dmitry Dementyev <dementyev@google.com> 1489019520 -0800
committer android-build-team Robot <android-build-team-robot@google.com> 1496170959 +0000

resolve merge conflicts of 3964c51bf2 to nyc-dev

Bug: 33123882
Test: manual tests
Merged-In: If68343d155364654fa7db55ace3fb3c4db508c7e
Change-Id: I17ceca883819a161c4eab2a414abf0b64c320378
(cherry picked from commit 0f04a5a93f846d6f2d528ab6ae0c9e37d701e438)