Merge changes from topic "sp06-offloadcontroller"
am: 01d30a4ce0

Change-Id: I4549cb9b54ade6a9b45217be133aff535ec60b62