Upstream Changes from Netflix/Lipstick