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

Change-Id: I6ab59d0a799320aeadd0b8e9b3d97e1062a92b62