Removing conflict

Change-Id: I68f292f922341a43d93c5781740b996cc66444ed
Merge "Removing conflict" into folsom