Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp * commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125': Wait for initial device scan to finish before updating config.
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp * commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125': Wait for initial device scan to finish before updating config.