Merge "Removing all cuttlefish_common content"