New files missing from prev commit

Change-Id: I9889e97a7f9e70d8b2d82e26d9e0f971a943d007