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

Change-Id: I2453e3e4330eb0bfb5d28f2dd555aba09b16fe53