Merge "Don't consider resources < 0 as invalid" into pi-dev
am: 39b3e46607

Change-Id: I323020d7ae27dea81df860ebf34e756bc2544867