Merge "Add support cri container log format" into release/2019.2.0