Amended with commit 4dc7ae3131 Co-Authored-By: Dai Dang Van <daidv@vn.fujitsu.com> Change-Id: I446d1501596d2ea092cf2ff4de26695c464511ce (cherry picked from commit b493fd4b85)
4dc7ae3131
b493fd4b85