Merge "Hide deprecated APIs." into oc-dev am: 59fe3108fa
am: 4e71ae1243

Change-Id: Ib15e77c4ad3915ed41837584e587c2abbc6657de