Merge "Compute correct rejected time" into pi-dev am: 29e2a3dd92
am: 787409aec0

Change-Id: I178f89f3ac313eee9f8ffa6acedc4b7ff98774ac