Sarah Parker authored May 04, 2017 and James Zern committed May 04, 2017

This resolves crashes on awcy due to excessive memory
use. No change in BDRATE.

Change-Id: I1d92d0b53718cfc66f2842cfca68059bafafc64a