Header file sync for Fix 81023782

Signed-off-by: Hin Lam <hincheuk@us.ibm.com>