Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 am: ac02be311d am: 41707942a8
am: e21329ad86  -s ours

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