Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev am: f47b9cf1c1
am: d54303a1b5

Change-Id: Idaace935baa4834f1ceeb3ce931cf7003f64eb60