am: c1b407bb * commit 'c1b407bb': Fix Proxy2Test Change-Id: I04f25e55d0096576c8f1f4f89b51eaf37ccb29a0