merge lanchons patch (forgotten linux commits)

Change-Id: I1d33eefda006729dad42d51f03c4fab38d42721e
Merge remote-tracking branch 'github/cm-11.0-ads' into cm-12.0-ads