Merge branch 'stable-3.3' * stable-3.3: Rely on WaitUtil moved to the acceptance framework Change-Id: I80703fcb562ea8f3952cb07809f887a5a27fd5ce