A tiny optimalization

Change-Id: Ib2cb773ffe5cb579c2b46bd0e6a5a3f2c55d190d
Merge "A tiny optimalization" into cm-10.1
Merge remote branch 'cm/cm-10.1' into cm-10.1