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

Change-Id: Ib2f9d6ead64145846cb0f0c4889d0277db0a377a