Merge "Accommodate service disconnect / package update race" into oc-dev am: a3301df508
am: 2496ac8e94

Change-Id: I0358ae03a55fd79f992066aea6ef514f37069142