Merge "Merge "Force second measure pass when there is a configuration change"...
Merge "Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8 am: 512c406b" into nyc-mr1-dev-plus-aosp
am: b9efdf08
* commit 'b9efdf08':
Change-Id: I76464a5f9f57a95d16920cff7b0cd89309487c93