Merge "Fix NPE in isTrimmable" into rvc-dev am: a759c596fa

Change-Id: I9808faaa07860c52901fec971c7049d809d5bc37