Merge "Remove logtags property"
am: f2ed7683da

Change-Id: I599af7003bd4ef6cbb8f99ad4caba10ada2f1f43