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