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

Change-Id: I0c8477d2eda299cb9a773860e3ce24a88e1011f1