Merge "Fix NPE when starting advertising with null GATT" am: 4d98474f am: cff1ab62 am: 5eaffc9e am: f2c63d34 Change-Id: I43aa543e5ca87482f2973fac342d9b43c25b67e7