[automerger skipped] Merge changes from topic "sys-selection-chan" am: 57948ade am: 2d1f07f4 -s ours am: ddce5902 -s ours am: f9a1b5f4 -s ours am: d15c782e -s ours
am skip reason: Change-Id Ic5a130e5806b4516caa1a8510214eaf9b2b43b03 with SHA-1 0eea6259 is in history

Change-Id: I71e26c77f644e35950f83455746c34bd4b6ca15c