Merge "deployagent: set sdk version." am: 581f8e2a5a am: d51c8d5585 am: 9f0ff02057
am: 093f7078fb

Change-Id: I38504c2b0cf060e950b6f6e12993447fe0a970f6