Merge "Support lint suppression" into tm-qpr-dev