Merge "fix Potential leak of memory pointed to by 'sourcesLiteral'" am: fa81ba8775 am: e16a2029e0 am: 228b9dec45
am: 504a885be0

Change-Id: Iba5669ae28b61114a9357291e9ff5ac63ba7ad63