Fix requirement v1 message RPC

Change-Id: Ie9d4204bc871a62dfabf867e0c0df3deae3bfa55