Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev