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

Change-Id: I2920d1fca1593e86805ec8a728121cf2513e2bc5