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

Change-Id: I4636a410ec035c21fc20c04f47cada7b08c31b8e