[polymer] Merge of master into polymer10-migration

devil/devil/android/battery_utils.py

Index: devil/devil/android/battery_utils.py
diff --git a/devil/devil/android/battery_utils.py b/devil/devil/android/battery_utils.py
index c047f253bb75690e0d8418c32ccf68a29e728277..7a735f3540f5abb97c0f071ba1f851597778e4ad 100644
--- a/devil/devil/android/battery_utils.py
+++ b/devil/devil/android/battery_utils.py
@@ -95,6 +95,19 @@ _DEVICE_PROFILES = [
     'current': '/sys/class/power_supply/ds2784-fuelgauge/current_now',
 
   },
+  {
+    'name': 'Nexus 5X',
+    'witness_file': None,
+    'enable_command': (
+        'echo 1 > /sys/class/power_supply/battery/charging_enabled && '
+        'dumpsys battery reset'),
+    'disable_command': (
+        'echo 0 > /sys/class/power_supply/battery/charging_enabled && '
+        'dumpsys battery set ac 0 && dumpsys battery set usb 0'),
+    'charge_counter': None,
+    'voltage': None,
+    'current': None,
+  },
 ]
 
 # The list of useful dumpsys columns.