Moved some comments around.

Change-Id: Ia8e0fdfc1c8ab9ae972d14e04cd65d34c9e2f02d