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