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

Change-Id: I20826e0229db5596bb5e7ecffab274542f735931