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

Change-Id: I19e2e8b28d9be380c233749d04108f436a3e7ae6