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