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

Change-Id: I240d0935b86b1cd0a414dc1c00e3158c1cfb3999