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

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

Change-Id: I48742b9ba712403897ba39e5d2169f7d36c65179