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

Change-Id: I3ae8054decc79b1b04f80ce20d48860b86308e56