clang-format: ContinuationIndentWidth: 8 am: d4f1d1e89a
am: fd728d6b91

Change-Id: I511a369bf84448b7bc6ce928eb4dad88af03e240