Conflict hunks solved

Change-Id: Ib3f864903f9fc92fca0bbb4dc047c6fa6b8c0972