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

Change-Id: I2830b891fcce6f3d55922c8fc42ec4d6ab77798b