Minor post-merge cleanup.

Change-Id: Ic65ef882b61aa6506d21bbe41b9ac8473a950591
Merge "Minor post-merge cleanup." into cm-10.2