Merge "[SP21] Address comments for API council review about aosp/1172143" am: 12b21035c4 am: be47eb855f am: fd96c7cc49

Change-Id: I5c77bcd0a95e51c91c306981c5f396f445da5ab8