* commit '88337ac8c0ada1f3baef25cf9d4d9d85b2a8459e': Resolve LocationManager + ActivityManager conflict