Merge "No longer upgrade password quality based on keystore" into mnc-dev