Merge commit '6264c4c194e0bbcd060409e0e8c0abfaae3bdf10' into mnc-dr2-dev-plus-aosp