Merge "Making constructor with arguments public for AwareResources" into sc-dev