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

Change-Id: Ifb8e40bec59ebc19fb3a260c8dca9d9c14135fab