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

Change-Id: I60df96517cb8bb8a03075ee78e5cff7ba2cb2965