fixing common lines

Change-Id: I9631737d5a1ca74a19eb19cc4ab164ee680467aa