Merge "Merge "Mark bucket as condition_unknown properly" into rvc-dev am: 97d79408 am: 04502832" into rvc-d1-dev-plus-aosp