Merge "[automerge] DO NOT MERGE Merge state producer and feature producer. 2p: e5c6ad5d" into sc-v2-dev-plus-aosp