[automerger skipped] Add slot suffix to DAP ops am: 35d5e9f4cf am: 9f8b386056 -s ours am: bd312b8c65 -s ours

am skip reason: Change-Id Idbd0bfea142529a33dddb4d2debfc74513290730 with SHA-1 bc7e1db211 is in history

Change-Id: Ie04ea27ebc39d355d17c8da2ff0dd2d03d57a865