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

Change-Id: I58b230bb33330fbb130094cc937c4aeaf5976baa