New changes needed for msm-3.5 clang

Change-Id: If41682c7265645056be757e58eb14b8707ce7438