Merge "Mark two unfinished APIs as "DO NOT USE"." into qt-dev am: a8a95549ff
am: c95eecca78

Change-Id: If8f5b71af663ded930ed24381a8a00250fb7c5c9