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

Change-Id: I4e7924ebb2d37ecffb8facce0ec51643afb12264