vendor/ testing branch

Change-Id: I9ad1287cfd397a3f7e283bff4372f1b2e5742509