Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev