Merge "Fix NPE when starting advertising with null GATT" am: 4d98474f2a am: cff1ab6210 am: 5eaffc9ed7
am: f2c63d34b5

Change-Id: I43aa543e5ca87482f2973fac342d9b43c25b67e7