[automerger skipped] Merge "Added handover support in the factory" am: 0d6bbfd5fb am: 4ab47dc5ac
am: 201defcb02 -s ours
am skip reason: change_id I10cf40bf32dc30393dd538477aaa411a48b4ccf2 with SHA1 5f1186eca9 is in history

Change-Id: I7d105392a2b1f4ae7a2baaf1d0d2d8627a561412