Merge commit '489931b6ce22434b943bdf8381b376f429b58633' into mnc-dr2-dev-plus-aosp