Add back Note 2 variants

Also alphabetize jf

Change-Id: I5fd08a9ed03a4e3047645096968839450db1d30c