Merge "Ignore flaky locked message test"
am: d14b09335f

Change-Id: I522a332631198d8dd518e10946e1209b7ac19ed6