Merge "Make test 044-proxy less flaky"
am: 212e375f3f

Change-Id: I398d64cb82e20d4a693e9f5e0c93345eb1fe7f6e