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

Change-Id: I180a256800b1203c3ceef3af9e7c9952909ba114