Merge "Marking SoftApCallback methods as SystemAPI" am: 8295ffc5af
am: 179ed7d640

Change-Id: I0498bdefc05aad2b56c68f586e480d06b9fe80c1