[automerger skipped] Merge "setDefaultImpl aborts on a second call" into rvc-dev am: 513a77cffd -s ours am: 3005234a49 -s ours

am skip reason: Change-Id I659d3eaad3a45dcba608fa79a08f083f84bc4d58 with SHA-1 81087399e9 is in history

Change-Id: If73ffb11042996f89acf7f1de984f9f5bb5140fe