Merge "setDefaultImpl aborts on a second call" into rvc-dev am: 513a77cffd am: 613a2b0157

Change-Id: I484e6211d81dae61e10eec31834476794c31d930