Merge \"Merge \\"Merge \\\"Avoid throwing when 0 size layer requested\\\" into nyc-dev am: 807989facd\\" into nyc-mr1-dev am: eaeee37417\" into nyc-mr1-dev-plus-aosp
am: 04fd0ab1c4

Change-Id: If57d409bb6cdd86fd8ba613857e0e34034abc2ee