Merge "Added handover support in the factory" am: 0d6bbfd5fb
am: 4ab47dc5ac

Change-Id: Ib051a406497dc68361729437342ea0281875b0ef