the feedback from API council Fix: 71818127 Test: Build Change-Id: Iab976fefcf00e0d5abada123b7c19344241b928a