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

Change-Id: Icffd3a692b8a6a515187b5a6603dac0709a4562b