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

Change-Id: Idf51f20246e2bd91dcc0b65ec2102b788d9e10fe