[automerger skipped] Handle cleared preresolved strings
am: fb5eba3545 -s ours
am skip reason: change_id I9c260bbfded26e9481381e9978596907e48c3307 with SHA1 77f84fcc25 is in history

Change-Id: I175a4aa893b7bc9e6d2b70ca1c93d5011e1621b8