am: 3dcaa157 * commit '3dcaa157': Fix Proxy2Test Change-Id: If43329ed7d02c502533c549680c87c974659d97f