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

Change-Id: Id351b58f26ed663e79f891a376e03f0e52023805