Merge "Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f2 am: 732f43e5 am: 69a683ff" into rvc-qpr-dev-plus-aosp