Merge "deployagent: set sdk version." am: 581f8e2a5a
am: 4818e210cc

Change-Id: I76e74c4d418f1627ff2a0992ef7acdb804be216e