Back Merge from data.lnx.3.0-rel

Change-Id: I15696fca495d2d3e42eb08b3bf86d1f9a3bd7339