4.4.1 merge build fixes

Change-Id: I4e4959a25e280b96aa832c9fc49cc0d6c77b0cd0