Merge "Enable per-use user authenticated keys to be used." into mnc-dev