Merge "Remove obsolete files"
am: 7ad8cc7024

Change-Id: I73f5f70c12d84f8f8538e39388eaaf16c537207d