Merge "Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f2 am: c8c43b25" into rvc-d1-dev-plus-aosp