Merge "Fix minor time bug in ConsentCallback::getElapsedTimeMs"