Merge "Update comments on onApnUnthrottled"