Merge some SHV-E330S UCNJ1 memory managing changes.

Change-Id: If433052220255113ab7803d056da277311083c45
Minor cleanup and fix for ack errors on mdnie init.

Change-Id: Ic306f68586160b5c2b463315169d0dd998b31f21