am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev

* commit '1d16570b374ffaea89a3e3d403146008d12e60b9':
  Eliminate race conditions in UID-based network filtering.