Merge "Avoid a NullPointerException in getDevicesMatchingConnectionStates" am: 0b6f8f56d3 am: 70163507e7
am: 5a1ffc7a65

Change-Id: I6a00b253806e487f02194a35efd069cd2af5016a