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

Change-Id: Ie7f0fd172d6cb009fcc91d1db44f58f13813c376