am b0d30271: Merge "Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885."

* commit 'b0d30271699ecd48be791bbd002d2366b831a624':
  Fix formatting in 4df4dfedf6beef891d05d4e80704f5f4a594a885.