Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: I156c373b858e99b892c66f941005409097937714