Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev
am: 4823493647

* commit '482349364715dfcd87dc83e0913fc60dc6df0497':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure