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

Change-Id: Ie5ed67db841478cb6bbc6b90f768521d049833e6