Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 9435fc5e20)
9435fc5e20
(cherry picked from commit 453a982e63)
453a982e63