carl9170: Update based on commit 370b7919114a02149088c482c8709cafb9bf7478 dated May...