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