Adding initial version before Havana to enable migration from Havana and including recent changes for IceHouse. Closes-Bug: 1265080 Change-Id: I4b18d6d7eb40a9e3b2f3bceaa750827f3ed7c93d