Merge "Fix NPE when starting advertising with null GATT"
am: 4d98474f2a

Change-Id: I0a90b9694682e8b09baa99882d08db5c76364a6b