Merge "Adjust future charge start time." into pi-dev am: 6c2679d55d
am: a103bc51f7

Change-Id: I52ff1e259f17716b6cfeebb32d332116f7b9f790