Merge "Enable device identifier check for non-priv apps"