Merge commit '6e361344fda22c98a36c596819470a699896dcac' into mnc-dr2-dev-plus-aosp