[automerger skipped] Implement construction of container layers am: c1ea10447f am: ef7f39f4f5
am: 049902d9eb  -s ours

Change-Id: Ib66c14ca48d1654284896d6af0c4a22dee61343b