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

Change-Id: Ib812102cf86f186182750be060e95b2aa72bba88