Merge commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015' into eclair-plus-aosp * commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015': Add private API for data with presence.
Merge commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015' into eclair-plus-aosp * commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015': Add private API for data with presence.