Merge "Update Cipher change markers."
am: 5f07a13e4f

Change-Id: I0a31444d56b45b98bee75db4d87b2f8c7852dbba