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

Change-Id: I8d523380b1092a9f0c0606f03dca0146cc3cde8e