Merge "Fix requiresCharging false value ignored issue" into nyc-mr2-dev