Merge "deployagent: set sdk version." am: 581f8e2a5a
am: d51c8d5585

Change-Id: I76e74c4d418f1627ff2a0992ef7acdb804be216e