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

Change-Id: I43160200a63a40cc0d766756928c4398cf956b67