Merge "[automerger skipped] Merge "setDefaultImpl aborts on a second call" into rvc-dev am: 513a77cffd am: 613a2b0157 -s ours am: 1b9e4b7f9d -s ours" into rvc-qpr-dev-plus-aosp