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

Change-Id: I2d3379808cad04d3353a292e2f4e76dc3307ed3d