Merge proposals dependent on lp://staging/~cmiller/ubuntuone-android-files/googaly-to-ver142

lp://staging/~cmiller/ubuntuone-android-files/googaly-to-ver142 has no merge proposals.