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

Change-Id: I1af53b076232058d4fd846724ee9beafd9051e19