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

Change-Id: I48fd9869dcf36c7cda65e081d04c7651725b7fe4