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: 4d283237
Change-Id: I5f114c30bc4fcfa8fbb3474c47718a229528ba57