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