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

Change-Id: Id1062cbb6be6c6f02ee09bd575b40ccd49b20b78