db1045 to s5

Change-Id: I50dbf79cb25ad1fbd153a869c4c529cb251f1b0e