Merge branch 'gerrit/mad-hatter'

Change-Id: Iea79649e6babf3b3ca31db5d56cb5ef71aa8516b