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

Change-Id: Ib75490e7752f61834f25af57d091dfe5b22de291