Signed-off-by: Morten Torkildsen <mortent@google.com> (cherry picked from commit cb2207c2fb)
cb2207c2fb