Missing new files from previous commit

Change-Id: Ic8d7c13602c8831e411181c802eb825124578b19