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

Change-Id: I491f1842da06d5bf0dfc8facc9bd031c024d565a