am 5e034226: am e1c94726: Merge "Work around inconsistent views in...
am 5e034226: am e1c94726: Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
* commit '5e034226':
Work around inconsistent views in RelativeLayout.onMeasure()