Merge "More store/allocation elimination."
am: 6f1b65d3b1

Change-Id: I391e071daf27bb4cefa5143bc54836f604b48b3a