Merge commit '3e4b6d219f1f015cdf16a5ae750acd8050d7d9d9' into mnc-dr2-dev-plus-aosp