Merge "Device-agnostic policy for vendor image"