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

Change-Id: I6fbbfbe767859f011bac81d2a56445b3c8651280