Merge "Merge "Address API council feedback" into qt-dev am: 1a5d1728af" into qt-dev-plus-aosp
am: fc4b6581ed

Change-Id: Ie2b66571070425f037bf1ddb4c87001ebca9b39e