Merge changes from topic 'fuguWifi' into oc-dev am: 0d0fb634ec
am: d04ec801df

Change-Id: I47113c7cc6bb5cf95776ccb9e2b4384feff65896