Merge "setDefaultImpl aborts on a second call" am: 196feae688

Change-Id: Ieea885b8da74402cb90fcd0ba391b63bc1dd4a4a