Merge "Add DENSITY_600"
am: 8ac363088c

Change-Id: I92fac616676fb93fcbe1ddc59b2e577b551cb387