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

Change-Id: I1a9bb5b9dab0513ffeb080f1025943e3fe2d39fc