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

Change-Id: I124dc4a15563effa89049e87efe2304867d05961