Merge "Fix the name of the constant for device [dis]connect parameter" am: 998c4cd02f
am: a8770db02d

Change-Id: Icde1704bd46642567050f4704d4d65ac9ad96845