Merge "Hiding text from obscured text fields." into oc-dev
am: bcc6cc84bf

Change-Id: I06ac2af600c9703d5af9b583b63ff79ab01d6c68