Merge "Error when hash has changed." am: 677eee85a2
am: dca14500a5

Change-Id: Ie4a96a736c32a9f98cc1e7a3939cf3765abbefff