Merge changes from topic 'fix_configure_chip' into oc-dev am: 5eca115b68
am: 24e03c6303

Change-Id: Ie888172fe36ca78e218b4fdaaebd6c2ae592eddc