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

Change-Id: I6cfdf69a9752a481e5c03780ac596f5b4cbd4eb2