Merge "Remove unnecessary orientation attribute."