tree c7514eb9f311a6794b5f143549f4f30d4cfc0946
parent e3c28fd5c86145e8da4c0fa31a303f71b817272e
author Marco Nelissen <marcone@google.com> 1487108947 -0800
committer android-merger <android-merger@vpba3.mtv.corp.google.com> 1488227942 -0800

resolve merge conflicts of 3654ad0 to mnc-dr-dev

Bug: 33818508
Bug: 34013472
Change-Id: I2e99cbceba1c00555d624e8975522725e362362b
(cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)