Merge "Remove logtags property" am: f2ed7683da am: 9367657b27
am: a7cfd1e93d

Change-Id: I95218306f0acb891f7a8324ad8f94ace4ae48886