Merge pull request #5 from jied83/jellybean

data usage fix
proximity fix

Change-Id: I7ef25980fa35466823d7a1f57232e0c555bc69a0
clean up

Change-Id: If3e0186db234b300bf180e1ba042ab5b7ce5c6d0
Merge pull request #3 from jied83/jellybean

Jellybean