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

Change-Id: Ie15bca39db22785a01423bc92ed0ce402c0aed72