Import 51f25df304aeaa6c1b02ef7456a61278ee70c102 from upstream. Signed-off-by: Etan Kissling <etan_kissling@apple.com> (cherry picked from commit a16faf72b1) Signed-off-by: Etan Kissling <etan_kissling@apple.com>
a16faf72b1
Import 662c8f44d53492d2e0ebd430dadef12d580ec330 from upstream. Signed-off-by: Etan Kissling <etan_kissling@apple.com> (cherry picked from commit 73060f9104) Signed-off-by: Etan Kissling <etan_kissling@apple.com>
73060f9104