Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84
am: 838851364b

Change-Id: I0b19a98ca157d87c41a3a305b9ae59bb65a9cffe