[automerger skipped] Merge "Mark two unfinished APIs as "DO NOT USE"." am: 5e83291083 -s ours am: afa4db8687 -s ours
am: 930e5db06b -s ours
am skip reason: change_id I3f06040fdda25c7aa27be45cd90177136f7e996f with SHA1 bfa821b43a is in history

Change-Id: I13546777064f36ed36633ec87381c0f5e26b2789