[automerger skipped] Merge "Add support for LoggingOnly changes" am: 33e09a3630 am: 6fafeff7a5 -s ours
am skip reason: Change-Id I379c63f8b5c54500d9066be9363a186efd55d200 with SHA-1 fd87a60be8 is in history

Change-Id: I7f55d683971e259fcefda4510c5b31b09414057e