[automerger skipped] Handle stop selection in same thread am: be9b0af7a1 -s ours am: 2a8ae3d600 -s ours
am skip reason: Change-Id Ib84329c401783080e3b741a8d62ed82c6057ad22 with SHA-1 23266d420a is in history

Change-Id: I17534b19772d693a063e6a0c104c3f29998c5f24