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