Merge changes from topic "fusectl" into rvc-dev am: 6030f2f016

Change-Id: I1bcb4f6e3cd587f924012196879ffe4d48cd1af5