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

Change-Id: I51a336636135a8efd76a3832452d31ea23dbc0d7