upstream update

Change-Id: Idf15527e244905d49b4af9a35f55900951559115
cleanup social icons

Change-Id: I5f074b7934123312fc20fa23ad8d5e3ea8c0c6ab
header cleanup

Change-Id: I4052fadffe412c534ce6137c06733f46869c222c