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

Change-Id: I3dde6cf192b33c7eebf27c0c2dbac03020302898