[automerger skipped] Merge "setDefaultImpl aborts on a second call" into rvc-dev am: 513a77cffd am: 613a2b0157 am: a48f2a6b87 -s ours am: 877055b90f -s ours

am skip reason: Change-Id I659d3eaad3a45dcba608fa79a08f083f84bc4d58 with SHA-1 01097e2410 is in history

Change-Id: I6df42f41a02fb855345415b9142351dce271f95d