Zero: updated 436-01 436-04 - both unified, both support https

Change-Id: I636d965f975cca539354d61d6c4494566f302bf3