Snapshot 09118679ff7861de0fe2b742591e5d6aadba3fcc

Change-Id: I35cdb320673d847d8122bc03b9832d13673ea208
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1-linaro