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

Change-Id: Ib2f14771f9788f954b30ee6ef3981b9a1b714793