Merge "deployagent: set sdk version." am: 581f8e2a5a am: 4818e210cc am: 2c2347732f
am: 093f7078fb

Change-Id: I38504c2b0cf060e950b6f6e12993447fe0a970f6