Merge changes from topic "cellinfocallback-error"
am: 360e25280c

Change-Id: I6d9fa8b2f640abca0708a84ed76e450f7f5f9e72