Merge "Disable kAppImageMayContainStrings"
am: 2595137a5e

Change-Id: I6d47aab931a34f920e36ac12509148cac7d6423a