bacon: [HACK] Workaround for dynamic buffer issue

 * For CTS issue. Remove when issue is resolved.

Change-Id: Ifeb25967ebceb711d72d8290a9d707890d083bb7
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0