Merge tag 'mailbox-v5.4' of git://git.linaro.org/landing-teams/working/fujitsu/integr...