Merge "setDefaultImpl aborts on a second call" am: 196feae688 am: 2804e79b5c am: 63a8b19cc4

Change-Id: I999cdd9d753ec0918958bff92a00b2842bed3258