Support for fake density

Change-Id: Ie89858d126a33e5694ebd4f0d3d77e36cb161894
Merge remote-tracking branch 'ev/lollipop' into lollipop-dev