Merge "service_contexts: strip blank lines and comments"