prepare for s2 master rotation db1036 to db1024

Change-Id: Ie9af63b1ce192eaccd718ac4ff91381d83d0f967