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

Change-Id: I3f7e5391b30c8201889a3699a7d3caba3087896d