Merge "Enable device identifier check for priv apps"