Merge "More store/allocation elimination for singletons in case of loops"
am: 9d7c8a3bc1

Change-Id: I53b3ad0425da497f5754157387618e7de40241d8