Merge \\\\"property_contexts: strip blank lines and comments\\\\" am: ee69a2e7 am: a584f2f6 am: ab9c389e am: 5408d540 Change-Id: Ie9c16378c5ba3705d97e3dff1cf349526dfdcaf1