Few more things for uppercase ids

Change-Id: I9b28ee8c597836d37d6e71eb18474466b4e04033
Merge "Few more things for uppercase ids"