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

Change-Id: I36ac24d6ffa41eda4d7cacee931410ee933744d3