Rebase from CM-12.0

Change-Id: Ie8505dffc428a35746efe7ebb53c355694f1dea0