The boot image may not contain the target String. Bug: 20323084 Bug: 31239436 This reverts commit 9ed010e4. Change-Id: Id299619ff9866bacd5098f76836355878a478042