pulling db1042 from s4

Change-Id: Ieb4503143fe85e1ff1e85b5fbcf9e001532d596d