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

Change-Id: I600e29c93f1565a1b4ba33e496f9efb7d2cef4d9