Depends-On: I894d9875048cb000765b4c8d6d94f62cb02c2988 Depends-On: Ia68b6e7252a2c971d059962b8302661e272ec24d Change-Id: I98c9e0c8c8b257bfd46c2e056dd44181bef9efad Story: #2003734 Task: #26400 Signed-off-by: Trinh Nguyen <dangtrinhnt@gmail.com>changes/30/602030/4