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

Change-Id: Id1048a85d04f1b418dd5bf6d84b2d2e9144d7df5