2nd Half of the update from gerrit.paranoidandroid.co

Change-Id: I61ff958e6a82b05d5b059956d41476af692f7a33