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

Change-Id: Ife0cafa6a2e6eff902ce4b1439c9d002eb4ed643