* Change necessary bits to support our project move Change-Id: Ie5acc8406877392caac7210885e4188ce7568bbd