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

Change-Id: Iac20b105c6cc63c468306840ccc4863097f45e93