Merge "Merge "Fix NPE when assist data request times out" into nyc-dev am:...
Merge "Merge "Fix NPE when assist data request times out" into nyc-dev am: bc6d96e4 am: 61e2f9fe" into nyc-mr1-dev-plus-aosp
am: 7b9e5724
* commit '7b9e5724':
Change-Id: I3ec2edc6cd81b623ae57edabe2881f2a117bb00e