* commit '75819a9cddd646af72a6071311d8e5b3cd6b8c43': Resolve LocationManager + ActivityManager conflict