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

Bug: 33818508
Bug: 34013472
Change-Id: I2e99cbceba1c00555d624e8975522725e362362b