Merge collision inevitable

Change-Id: Iae9f3447ef06cd104373f2e6131df51a09d1b73f