move db1036 into s2

Change-Id: I0ecb34f56e2a0a219cb5481099d778bdd0fe190b