Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
am: 6ba96df815

Change-Id: I6551328b80a849013ea121ded03333e2a9475145