Merge "Fix boundary condition for targetSDK gated changes" into rvc-dev