Merge "Set initial density to a fixed value" into nougat-cts-dev