Merge branch 'hydra' into HEAD
This is Legacy

Change-Id: Ibc002dbf84f1ccc4e520562081317809e34d504d
Hide your taint!

Change-Id: Ic00fd76f008fd4a57d8ad1022535b72e9ea698eb