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

Change-Id: Ice788fc3d3c9226fa47df0b598927ea4a349332e