Merge changes from topic 'wifi_1_1' into oc-dr1-dev
am: 291721771f

Change-Id: I8253fd29b38e8689d1593c2f707d4c9c0ec4cec9