Merge "Hide internal value" into oc-mr1-dev
am: 1275653c94

Change-Id: Iadfce3dc11118f047ed82e3a716645977641c961