Update to upstream latest

Change-Id: Ibbc7c75d13b682c9c69e394fd38294cc5117dc17
Revert "Update to upstream latest"

This reverts commit f78cfe0d0fcf8442cbc80cda81366097340c89f6.
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1