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

Change-Id: Iab564ecfc74e12b4f3a3d2a3271657398b9de1ee