Fixing cla overwrite

Change-Id: Ib58470d57a1dc5aea444752e7b1c01d9099d316c