Merge "SoftApCallback using executor vs handler"
am: 60bd816476

Change-Id: Ie1fa6d76883ed5ee1a9e4390637a8f514e4cdbdf