Merge "Merge "Fixed null callback issue" into qt-r1-dev am: f3395734e8 am: d084c899d9" into qt-qpr1-dev-plus-aosp
am: 8dfcc3bf2d

Change-Id: I2b9e10503a8c58ea86776d430f08c08238c33fb6