am: e5dfd08c * commit 'e5dfd08c': Fix Proxy2Test Change-Id: Ie49bf0ed4937a4ba8a47f1aeef018ca9f0e7b0d2