Clean-up E011 and E020 messages

Change-Id: Ib1dadf9975a9f223bb385f21f7156a41d04fe137