Manual merge after a merge conflict. Test: robotests Bug: 64165583 Change-Id: I6eab018dc4065ceefdba2039a5842945e2f76a75