Merge "Fix broken test on GSI branch" into stage-aosp-master