Merge "Replace usages of my_register_name with my_all_targets" am: 077d9d5fe7 am: e373117cac
am: 1f351ad75c

Change-Id: Ie0b935e6209a941cfe992276270b5b5b3e5c4f95