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

Change-Id: I2569f151a34fd5ca62a1b70c041b17603920ed27