Merge "Clarify unquickening comment." am: 7de725b25d
am: 2de3d0ecc4

Change-Id: Ife6fd86962ffc18a246f2f16dcb31040cfe21b0c