Merge "Remove unused IntentFilter in LocationManager" into jb-mr1-dev