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

Change-Id: Id33825d72c8fa402a952cddd58c9a50f878ef3ff