Merge "Revert "Revert "More general store elimination""" am: e0d8bd4b7f
am: 7151e6a44e

Change-Id: I0d946bda34c5dd128e02832aaaed79a26b477b08