Merge "clang-format: ContinuationIndentWidth: 8" am: c696782032 am: 43c0169b8e
am: d96ee967a2

Change-Id: I825db4d707580bc3b873a23f4b9161152d4bbf36