update from https://gerrit.paranoidandroid.co/#/c/235/6

Change-Id: I102e76e82f66bc9293a99fa33e88dfab513678e8