Merge "Update genrule location label"
am: e41a30847c

Change-Id: I7d5b90cde65eeae1fddf275ec75f5f1ff55f8610