Merge "[SP21] Address comments for API council review about aosp/1172143"