Merge "ResStringPool: Prevenet boot loop from se fix" into pi-dev
am: 8dd9ef190b

Change-Id: I0000c4a3f06e002804aa7172505e07bb57c550c6