am fe730536: Merge mnc-dr-dev-plus-aosp into mnc-ub-dev

* commit 'fe7305364c3369f9222a61646c5c9842eae9bceb':