[automerger skipped] Merge "setDefaultImpl aborts on a second call" into...
[automerger skipped] Merge "setDefaultImpl aborts on a second call" into rvc-dev am: 513a77cf am: 613a2b01 -s ours am: 1b9e4b7f -s ours
am skip reason: Change-Id I659d3eaad3a45dcba608fa79a08f083f84bc4d58 with SHA-1 01097e24 is in history
Change-Id: I05b1251afc33a5f5d8987878697a54020f90cda6