Merge "Add support for LoggingOnly changes" into rvc-dev am: e9e7d56cd9 am: 8b676fa9e5

Change-Id: I4ee16e4a9872c31ead2da1f3412a3af9f9b4c6af