* commit 'c8b912aa9fc37241757a0622fbb1b80f0554e987': Resolve LocationManager + ActivityManager conflict