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

Change-Id: Ia7ce76a26148b60195c8b7a71607ce62285f3151