Merge remote-tracking branch 'origin/mnc-dr2-dev' into mnc-dr2-dev-plus-aosp