Bug 5080369: merging new assets

Change-Id: I303ba0329052cfc4268b0b95c49650a906ab41a9
1 file changed