Fix for non-trimmed mode

Change-Id: Iacaf2c2a62884aa530da46304981dc345ec5b13e
Merge "Fix for non-trimmed mode"