[automerger skipped] DO NOT MERGE Set ContainerLayer for buffer-less surface am: ff674ee468  -s ours am: 50ac110a5c  -s ours
am: 418cc09ab6  -s ours

Change-Id: Ibc65ca91b12dd0ce60460d41e76639dcce582a9a