Merge commit \'e7e87a1440\' into mnc-dr-dev-plus-aosp
am: 066c920807

* commit '066c9208073ee6cc8fac58b8cb16fa40dd329998':