Merge "Fix pessimizing move." into mnc-dev-plus-aosp