Merge "Avoid race condition when broadcasting device list changed." into pi-dev
am: 2914820ebf

Change-Id: I60801432a37de495e2b2c9282f8c2bfef17aab4d