Merge "Merge \"Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-dev am: 807989facd\" into nyc-mr1-dev am: eaeee37417" into nyc-mr1-dev-plus-aosp