Fix support for latest changes done in gerrit master Change-Id: Iab8ad252c26924bee60d15ac120e62faf9fedc66