Merge proposals dependent on lp://staging/~doanac/phablet-tools/mterry-fixes

lp://staging/~doanac/phablet-tools/mterry-fixes has no merge proposals.