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

Change-Id: I84846327dcd6281fa5d8569f6a4c9fdc08ccd270