Merge "Fix quickening logic"
am: c7ae623f11

Change-Id: I43db7422d77fb8fc42af7e6843fa330b43ae269a