4.4.1 and fix up spacing

Change-Id: I518d192da98d1146404a31563165c031713c1137