Merge commit '6499e5ec' into pi-dev-plus-aosp