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

Change-Id: Icc622c320f8ed1e2a86eb159d24036b041aa0de0