Merge changes from topics "ion", "scan" into rvc-dev am: aeaaeaabb1 am: aa2c7393ae

Change-Id: Ic1556d9ef4e36692988d7bf315967a20abee3184