Merge "Hide from the world that ssaid is in a dedicated table" into oc-dev
am: 71c999febb

Change-Id: I91b9e3bea2335b01c6f0d52500a3b3775c62d163