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

Change-Id: Ifa47abf1b3c0243cf9212006ef54d8190087dc87