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

Change-Id: Ieab28d08087e13bbfd406f25d0f5500f401dcbce