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

Change-Id: I359ce72299fec16419de1323880784166a49cad3