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

Change-Id: Ic49a94bdf60bde65b02535377163e2da062d4a43