Merge "Merge ab/7061308 into stage." into stage-aosp-master