Merge "Clang-format before updating storage proxy" am: 2d85880b49
am: 71e96ea355

Change-Id: Iac10899a94dc084eecab080cd1f45c17d2975212