Merge "reset carrier actions on APM" into oc-dev
Chen Xu [Fri, 12 May 2017 18:52:14 +0000 (18:52 +0000)]

Trivial merge