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

Change-Id: I2043256c051f0cab5b148071935ce6edb4df8d02