Fix requiresCharging false value ignored issue am: e33c3c81af
am: faf365dd5e

Change-Id: Ia3d29cfb59e0eba6aaa536c28e48c17c4d4f9ac9