Merge "Fix getting wrong instance when restoring non-config" into oc-dev
am: 8386603230

Change-Id: I7ee0bb17c62ec2a40c4f2e168f88296b7bc86989