Merge branch 'gerrit/mad-hatter'

Change-Id: I68c0a52780a10c96030165fa5c34426d88f5b57d