Merge "Disable submit button when PSK pass is invalid" into oc-dev am: 35cc22fcf2
am: 7038d26861

Change-Id: I56f1454f007c3f295ce0d2dc41ca91dcf4d9e3eb