Merge "[Provider Model] Cherry-pick from master ag/15008434, ag/15023697 and ag/15023698" into sc-v2-dev-plus-aosp