We've cut the stable branch so update all the helpers. Change-Id: I3a250d6c408efd3cf66050e62a3759b30697b26d