Note to self: You cannot copy from CM's manifest to ours

Change-Id: I131653a13c642e57c96265b38fad35497f6f064e