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