Merge "Mark ab/6881855 as merged" into stage-aosp-master