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

Change-Id: I807c380a42ab7b259b61a0a26f312d101fb13daf