The suggested changes have been made.

Change-Id: I6e7f39e32b479eb28f6b7eab5216d8eed48cc13e
Merge "The suggested changes have been made." into cm-10.1