Merge "Merge "Merge "Set initial density to a fixed value" into nougat-cts-dev am: b72f32556d  -s ours" into nougat-mr1-cts-dev am: a86bd906eb"
am: d223385e8b

Change-Id: I765492e56710f058e95a1d20a59409c24fd63458