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

Change-Id: I835826b8197bea1e87491a8c18fc938d64c20f8d