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

Change-Id: Ie12513c9d469b5f5dae99008d3b77db32d9385f6