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

Change-Id: I09c2114b0ff2aa1badb414da9b3b5cd2bbd63669