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

Change-Id: Ie224a4624432d98ba1efd81e90d0bc634aeff3f6