Merge "Revert "More general store elimination""
am: 8dc11b7951

Change-Id: I09d8433be0eb2b62622c1bdadcd6284236699a10