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