Merge "Allow SLOG* to vendors" am: 6afbd476ab am: eacf704a6c
am: 708f8295e0

Change-Id: I8895882d557e162388fcc672375f721849b83fc2