Merge "Fix 3510307: Hide PIN passwords in ConfirmLockPassword" into honeycomb-mr1