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

Change-Id: I71d6bc566e061f1bce5075ca9f09119623b230f3