Merge commit '930a572ec310359844d2ab184de85b1ecf1d58be' into mnc-dr2-dev-plus-aosp