Cleanup subdata apis

Change-Id: I70d0d5e4ca2b42f3a9cbf854fe47917cee8f46df
3 files changed