Merge commit '08bb145a3c82d86ee26d3c567a929a2db41d9101' into mnc-dr2-dev-plus-aosp