Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master