Merge \"Merge \\\"Only skip trimming task if the stacks are not null.\\\" into...
Merge \"Merge \\\"Only skip trimming task if the stacks are not null.\\\" into nyc-dev am: 6ba96df8 am: f9eed3bf\" into nyc-mr1-dev-plus-aosp
am: 875debe4
Change-Id: I8ab7e1cd1bb8bc03a0326e431338d223f98e2bfa