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

Change-Id: Ib041932219d47504743fe82dc4a7f77ac1d9f630