am 2a808f97: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior...
am 2a808f97: am 09a5321c: Merge "Revert "Revert "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 '2a808f97':