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

Change-Id: Ib7ee22cee691b0fa7d6a247c564a3f640d5cbe33