Merge "DO NOT MERGE registerSoftApCallback Executor param" am: db46c349d8 am: ef9a466f45

Change-Id: If47309e800316b78b471c04529fd7ab24d7f72e6