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

Change-Id: I1ef33f1435c06f2ad2bc647d56180c5be1277747