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 am: 48bcb8c7f1 -s ours

am skip reason: Change-Id I659d3eaad3a45dcba608fa79a08f083f84bc4d58 with SHA-1 01097e2410 is in history

Change-Id: I40f41a59d85d4151cbb49dec212ace40d7d874df