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

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

Change-Id: Id44023a078c55776a8e9bebe9461d00443c7d76e