Remove container layer

Change-Id: Ib7a58820134705746415b1007a1ae75f27331830
13 files changed