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

Change-Id: I694166e3f8d1c52e6da8c076ead3d96bbbe35eb0