Remove short variable names

Change-Id: I8f352d8bfb3054bbbc9579353ed3b654664f4984
Merge "Remove short variable names"