Merge "Merge "Add support for LoggingOnly changes" into rvc-dev am: e9e7d56c am: 8b676fa9" into rvc-d1-dev-plus-aosp