4.4.3 merge fixes

Change-Id: Ic55bfd0286658bb783d5496303637a5b4f0d0e7c