[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 skip reason: Change-Id I659d3eaad3a45dcba608fa79a08f083f84bc4d58 with SHA-1 81087399 is in history
Change-Id: I928d828d4e9ff7fb22246cca98be31910c9b7c07