Merge "Avoid clock and challenge overlap" into pi-dev am: 223c864b65
am: 390ba215ce

Change-Id: I141d21e6bdef74d075fac4484ce9d3471301f48f