Merge "Make CellLocation and CellInfo nonblocking" am: 56800bca38 am: 67e88a10b5
am: 5ded60530d

Change-Id: I174fdc9ae49a59a1f043f802f7d9bf6ad708d0fd