Sundry commit for code format.

Change-Id: Ib16d95981af86d634e0ef92912f0f4e6602b9b86