Merge \"Avoid throwing when 0 size layer requested\" into nyc-mr1-dev
am: 272b827925

Change-Id: Ibd3f90aea167b7ee0e1f9add327a651ba94c7883