[automerger skipped] remove obselete instructions re: register setup and kernel tags am: d691fd76 am: 627d958f -s ours
am skip reason: Change-Id I8982eb6c8e9276a5f1e15e37fcbac954a5ac416d with SHA-1 c7ca9076 is in history
Change-Id: Id484e69fe246dee8c2024a8ad7fdd52b88ee45c5