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

Change-Id: I649f0e947771a9d8d1c74bbbb2aed8ae5bd3b960