Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into nyc-mr2-dev

* changes:
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800 am: fd1097e4 am: 5a632d1b am: 6714a260 am: 3a272fe4 am: 39261639 am: ad43c890 am: a659d7c2
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800 am: fd1097e4 am: 5a632d1b am: 6714a260 am: 3a272fe4 am: 39261639 am: ad43c890
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800 am: fd1097e4 am: 5a632d1b am: 6714a260 am: 3a272fe4 am: 39261639
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800 am: fd1097e4 am: 5a632d1b am: 6714a260 am: 3a272fe4
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800 am: fd1097e4 am: 5a632d1b am: 6714a260
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800 am: fd1097e4 am: 5a632d1b
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800 am: fd1097e4
  [automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf800
  ResStringPool: Prevenet boot loop from se fix