Merge "property_contexts: strip blank lines and comments"