Merge "Merge "Merge "Address API council feedback" into qt-dev am: 1a5d1728" into qt-dev-plus-aosp am: fc4b6581"