Merge changes from topic 'wifitracker' into oc-dev
am: b57b3dfc3e

Change-Id: I98df76a59575e2814b39c0afa2e725c6b5622e17