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

Change-Id: I4b4f848b6d5a90a1bf395a0cbda74d563d15b656