Merge "Make "am set-standby-bucket" reset active/working left time" into pi-dev
am: fab8e71697

Change-Id: Iac991dcc15b9e5c506e48c9072a4704aeaaad04e