Merge data.lnx.2.0-rel on remote branch

Change-Id: I8eeb824abc058bb4615a59d048b90c344ddb80de