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

Change-Id: I84504b330cb7ce2ca9250b0a9a6134abf6817439