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

Change-Id: I50245cc669359bd758ddee55311af30e95adbb65