Bug 58053 - func_name -> __name__

Change-Id: I0d48b1172018b8a0567175e47aaa5361b818d709
Merge "Bug 58053 - func_name -> __name__"