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

Change-Id: I17e06926ad909ebe8664a71f99261962edb7424d