Merge commit '210648c40e7c2001cc2a52df532a6ae8f89ac029' into mnc-dr2-dev-plus-aosp