Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: d58f8ba3b1 am: f1a59c9833 am: 9d23b89ef1

Change-Id: I463b8ee72ee68d390c4398e5287b6d1003197939