am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev

* commit '8dd280c2b95af184c8547065ba4146aceb2900ac':
  Use correct user when filtering app link candidates