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

Change-Id: I4b38b6d4a061144bede142a314ec57a4561f36d2