Merge "remove obselete instructions re: register setup and kernel tags" am: 899c6778c0

Change-Id: I2043c0edb22a848b5ea438f30417a2ee83ef9340