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

Change-Id: I0a67fbc3f8cc6fbe8cfb3d4a9becc290b9e9f4de