Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
am: 66ca42d5ac

Change-Id: I0e57e666f790c94ddf04d304a633c835a99d3d69