Merge "Add transactions for string resolve" am: d7a622279b am: f926eda881
am: 4eb4eea14b

Change-Id: Ia4ac7e940e799a22a12f5caf5701e6a27f91b902