Merge "Add support for LoggingOnly changes" am: 33e09a3630

Change-Id: I9b37f01dc0a6ab82de71d22f1fb34b8bc70cd619