Merge "Base: Remove LOG_S variants." am: aa00f5852f am: 8ca0a71c51 am: b98acabcad
am: 1160b42e1b

Change-Id: Ib35a356be70490260601aba64ea725198386bd49