Merge "@hide new API" into oc-mr1-dev
am: 414f1975b1

Change-Id: Ibf19c48a75a3af41f82817c438d8d67142a52cea