Signed-off-by: Christopher Ng <chrng8@gmail.com> (cherry picked from commit c7fc4b10100686c251637876ecdd15fda3c3d2db)