Release version 2.5.4

Change-Id: Icd09781bedeecc3947952261c7418da25147e1e2