Consistency changes

Change-Id: Id5c62940ef7084b97573cfd62974f3bc27dd418a
Merge "Consistency changes"