Decrease gaps between blocks. Fix warnings.

Change-Id: I142ff72d0925ef94c97f7ff54d04b7aef3415bca
2 files changed