Corrected Merge error

Change-Id: I1379dd04856b3f63af0b7335ffdd52dd8eefe959