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

Change-Id: I297730ce4f9da2bf30dde696439ab825cd642b00