Merge \\\\"service_contexts: strip blank lines and comments\\\\" am: afad0c35 am: 7d9487c9 am: 25b13451 am: 1bf9fa87 Change-Id: If27d080842df6410a3ab3cbd799f37322c1176a1