Merge "Remove logging dependency on runtime"
am: 27b88f3a2a

Change-Id: Ica477f15e9ee950f4cdf026272e52c0d3749825d