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: 9f725103 am: 3ea0e482
Change-Id: Icbdf4adae64f1a5b1a9e54841c8e37cae8ae37a4