Bring Manta up to 4.4

Change-Id: I1d2d4cb9dfb5cb35c4f84b7177ca49709f406ebe