Merge "Expand abbreviation in constant identifier." into oc-dev
am: 2c20a0f885

Change-Id: I2556528e6eed48196c622695c7d1e48043b5000e