Merge changes  into pi-dev-plus-aosp