This is why you should merge mergeable things from cm.

Change-Id: I98929a3226e524f58eca332abb6e43d425200277