Merge commit '32d29a534b0ed403230c2f213e9391d8ce76318c' into mnc-dr2-dev-plus-aosp