Lowercase to uppercase

http://i.imgur.com/xdt0REV.jpg

Change-Id: I2e8b7f606a0c82bc448a07a28829203c96e1d5a3
Merge branch 'cm' into HEAD