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

Change-Id: If585ade667c888d2f5f8e90a76125971178a7ba5