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

Change-Id: Ifa769017f525bbbfc8f2a94871e33aaaf0606407