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

Change-Id: I2617fe15174d5ca808e48d21fd5d4f9ac0f99778