Gerrit made this change in versions 3.3 upstream. Reflect that here. Change-Id: I580a4309b52a4a9c355624842057146a1922f5d1