Merge "Merge "Fixed null callback issue" into qt-r1-dev am: f3395734 am: d084c899" into qt-qpr1-dev-plus-aosp am: 8dfcc3bf Change-Id: I2b9e10503a8c58ea86776d430f08c08238c33fb6