am cccf85c2: am 8e614501: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev

* commit 'cccf85c287aea85121b15280bf3a89a2b7d3926b':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.