Was accidently disabled in 14c6bb798d (in January 2019) (Had to make a minor change due argument differences) Change-Id: If7c128cdeaa9ed82b2b33de1b75ca7cc4a95abdd
14c6bb798d