Merge "Account for getDimension() also doing a pixel conversion" into rvc-dev am: a29ccb6fa3

Change-Id: Ib26e96c742f6345d3183f93d13a798cb349dd251