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

Change-Id: I2d938e6596e9d5e95ea2697465e0bd57601427d6