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

Change-Id: I2f8654b285f46384b31885153ec92e6f587034b3