Import 51f25df304aeaa6c1b02ef7456a61278ee70c102 from upstream. Signed-off-by: Etan Kissling <etan_kissling@apple.com>