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

Change-Id: Ia270d8fc4e78968dcf98beb0f3539ac1fd6a64a7