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

Change-Id: I0d3fb69b92ad417802dd038bdf989a6b84cfc210