First changes

Change-Id: I49a9108d207b928156762d92212819ad01aa9a86
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD
Does this work?

Change-Id: Icf5847158dc71ef6936afa22d64c99ad79cbf4d9
Message goes here

Change-Id: I5e64f3458ffd48a892bb0fe23277d9d76a5e5a8a
Changes

Change-Id: Id7544b6e8ffddd4d6f703c8aaf1656173d5d60cc