Merge "Use to-upper function instead of $(shell tr)"
am: 67a3d45c89

Change-Id: I299df374bc079010f40b49268e2589e27d5902dc