Add note variants

Change-Id: Idd3340624bee2196f92398d48cd6ff71ea259e21