Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71
am: 53d241411a

Change-Id: If224f142cf1bb77ecf8ed515250ad5c813682eb0