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

Change-Id: I22b8b288c424ebeeb38a8bd13bf4b6e75d96665d