Co-Authored-By: Nguyen Hai <nguyentrihai93@gmail.com> Change-Id: Ie378a531250e88d5d3ef305cdc37fa457a1ec7cb Closes-bug: #1706189