Merge "ls990: clean up overlay" into cm-12.0