Update to 0.8.5
PR: 213460 Submitted by: Andy Carrel <wac@google.com> Approved by: maintainer timeout