Merge "Update monitoring policies with tcaPolicy"