Signed-off-by: Blake Geno <blakegeno@gmail.com> Upstream-commit: 9200fdd197f7c80c495597104928596516b36f41 Component: engine