Merge changes from topic "sys-selection-chan" am: 57948adee3

Change-Id: Id7eb7cbd1ea4a2e7da157d9801d46a5e76363b08