Merge commit '714a3ab7ae00f768a92f213119181a7422342c8a' into mnc-dr2-dev-plus-aosp