Add container aspect.

Change-Id: I54ea18ab91edb28413e01583231457b5190532c2