Merge "Wrap Log.v and Log.d calls in a compile-time constant." into tm-dev