Merge "[Manual] Remove empty blocks"
am: 8bbf8049c8

Change-Id: I10a0d6f0afda677962c6fe52ab99e4c46c2975dc