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

Change-Id: I66092fdf4e02c2631116d1c1b670ec169fd4a0ab