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

Change-Id: If3a254f3b075ecf4e3adf88f936254cfe9a692cd