Merge "Mark two unfinished APIs as "DO NOT USE"."