Merge "Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 am: 1699b51cbe" into nyc-mr1-dev-plus-aosp