Merge "Add DENSITY_600" am: 8ac363088c
am: e79f44a393

Change-Id: I9a4cc11b8d45bafa5a4c25171c51b663b1091188