Co-Authored-By: Dai Dang Van <daidv@vn.fujitsu.com> Change-Id: I446d1501596d2ea092cf2ff4de26695c464511ce