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

Change-Id: Ie4a21ca93e7aca9fa09671617cc73623af941475