Merge branch 'qcril'

Change-Id: If050c5c95493a9b3ecabb7db3cd12d78713f0ad9