implemented https://android-review.googlesource.com/#/c/101800/ for correct on demand selabelling