Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev...
Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev am: a29ccb6f am: 7b6a48ce am: e3433ca0
Change-Id: I2b01b5af4cf04d196030ba8d5d5e87159665dc39