Merge branch 'gerrit/mad-hatter'

Change-Id: I164914cc483a6fead7567161d7db888973ab5f97