Back Merge from data.lnx.3.0-rel

Change-Id: I285e09262415a53619a24bf677410280e4505d0d