Merge "[libadapter] Fix nullpointer in acceptchanges" into oc-dev