merge. latest changes to testing.

Change-Id: I76bf21245ec800d85604cd07428b0e9787fc25c4