2df40e2946
Change-Id: I1207f04771267702a7b592643a07dd0d92bacbc9 backport: liberty Partially-Implements: blueprint functional-testing-gate