Signed-off-by: Evan Hazlett <ejhazlett@gmail.com> Upstream-commit: e077f701dbd0cda8eaf4c96628e145c2cf450995 Component: engine