Fix git issues

Change-Id: I52500ccb31ec4aec20577956d0c94dd80afdd58e