Merge "[CVP] Add common to configureContainer method" into release/proposed/2019.2.0