Merge "[SP21] Address comments for API council review about aosp/1172143" am: 240f5bb4 am: fdbc8bc4 am: 6b233c75 Change-Id: I5c77bcd0a95e51c91c306981c5f396f445da5ab8