am 0505d35c: Merge "Filter out more devices."

* commit '0505d35c3f8cd58bd9203174831718b4ef7869f4':