[release] Snap to 85e6685445

Change-Id: I8ee7a2ec9aa2c0bdf7f919aa6d4d878fc86766f3