Merge "Always treat password as sufficient if no password policy is set" into oc-mr1-dev
am: f72a2f2c93

Change-Id: If5811c714c6e8576d60fb4267ea7e26308f599fa