Updates needed for galaxysmtd

Change-Id: I0abd545618cfcb5d17bfe6ad98d334db2831464c