Merge "Measuring the content views always at their specified size" into pi-dev
am: 13c0e0d19e

Change-Id: I011dfabd445e0f59b9532e5d044c9112dca65eed