am 4b9ba3aa: am a5700ce7: am fe666f85: am d550cc18: Merge "Add a test for none-mode filtering." into lmp-dev

* commit '4b9ba3aafce22ea3592a368a5617fcaaae073932':