Merge "clang-format local.h." am: 0a8d5f3eb8 am: 9d47ff97e0
am: a8ad2e2e96

Change-Id: I83fd10e67c3684a6fe39b40968710abe501ad50b