Merge "Update gpu args if instances created with any module of gpu." am: 9a40f28892 am: cd4dee1244 am: f5106a6f95

Change-Id: I5bb1e0cc68422158b3505e84d6a01c719f0c0103