Merge "Fix issue with deferred start of the background loader." into oc-dev
am: 13bd634262

Change-Id: I37ba0818f8bac5b88f2887825a0595f0550316bf