Merge "Always force set functions on disconnect" into oc-dev
am: bf783e24cf

Change-Id: Ic318103625dcd7b53c86df5fcd6778efb1081157