Merge "Fix usages of PUBLISH_STATE_OK" into rvc-dev am: 27db9b3a7b

Change-Id: Ie92ab47864c8abb161a66df50e068eabda6797c4