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

Change-Id: Iaf3bce5844fe5601b191ace0eb7fbf098d1200ac