Merge changes I30dfeadc,I186cf812

* changes:
  Fix and enable test for Trampoline.requestBackup().
  Fix potential NPE in Trampoline.requestBackup().