Signed-off-by: Reid Chan <reidchan@apache.org> (cherry-picked from 84ae6185b8fe67051044549d04f0609f5828890d)