Merge changes  into stage-aosp-master