Merge proposals dependent on lp://qastaging/~wlxing/ecryptfs/fix-bug-1678689

lp://qastaging/~wlxing/ecryptfs/fix-bug-1678689 has no merge proposals.