Fix remapRafIfApplicable get NPE

Fix: 295045828
Test: atest
Change-Id: I501a444bac3d0c81f5bb86e9350e2b1ee024e44e
2 files changed