[automerger skipped] Use SHA256 for 32 byte keys am: 020d535259 -s ours
am: cdbec49844 -s ours
am skip reason: change_id I6099156173e04b22c6edafd9fb0e072f7201c5ee with SHA1 cefbcbcb15 is in history

Change-Id: Ic51565b941a5a86e5b055a1eda44237291d77b68