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

Change-Id: Ic9881abb3edb26df58a56d82df4b0bfc92a068c7