[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 am: a48f2a6b -s ours
am skip reason: Change-Id I659d3eaad3a45dcba608fa79a08f083f84bc4d58 with SHA-1 01097e24 is in history
Change-Id: Ieb6260f768bb560af596cfc0de1442a1a9499fb6