Merge "Merge commit '177a5df9' into manualmerge2" into klp-dev-plus-aosp