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

Change-Id: Id1488228df87b0facf59f8ad24054ea09f1e94c0