Merge changes from topic "sideload_logging" into rvc-dev am: b0981c83d2 am: 4f1e32dca2

Change-Id: I93460716f53d3f952e1bfb8973f618cba3991b16