Merge "Use FLAG_UPDATED_SYSTEM_APP"