Merge "Test: Helper Interface for Testing SUW Bug: 67785122 Change-Id: Ia9707e2068311aa726b16d04d722ae40c42f88d2"