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

Change-Id: I390fbea45448e5910648b8e804ce54d77b8b8d01