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

Change-Id: Ieda4ac533daeedd487fd57a713407887ffcc67a5