Change-Id: Ifd026c71c1e53fe3ec4a1d81d0b0d4fbb80b24d4 Co-Authored-By: Duong Ha-Quang <duonghq@vn.fujitsu.com>