Merge "Remove DefaultContainerService and its references." into qt-dev
am: aede3d1a2b

Change-Id: I4662d3c4875a07e52670dc7c6b20e69216bdfd1b