Merge "Allow background default container service in a less crashy way" into oc-dev
am: 0283544c49

Change-Id: I863c9c8ae1d3760eb68d7169b8d60260731d6190