Add support for combining and remove individual resource
am: fb092d3b72

Change-Id: I8f64a4f1e9f4aa5279d8a7a4cd45a69bd7f16e22