Merge "Merge "Update requested state by comparing with source consumer" into rvc-dev am: 894a7974 am: 1568d918" into rvc-d1-dev-plus-aosp