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

Change-Id: Idcb11642acb230afe2f509ad75451729249bea86