am: 6c8951d8 * commit '6c8951d8': Fix Proxy2Test Change-Id: Ibbbf4386a4daa5baeb7a9327c9ebca4afea7dab0