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

Change-Id: I719fafb0edb60c03379ff60ebcf189e5e8a452cd