Merge "add an extra for rebroadcast of sim_state_change" into oc-dev
Chen Xu [Fri, 9 Jun 2017 19:39:50 +0000 (19:39 +0000)]

Trivial merge