Fixed a rebase conflict that got included in the repo.
Fixed a rebase conflict that got included in the repo.

Change-Id: I66b64fafaa9329e6f911778a49e78391e22fe455

giosalv/526-aladdin,giosalv/526-aladdin,giosalv/526-aladdin,giosalv/526-aladdin