Merge "Remove Duplicate Override for Operator Alphas" am: 24eaa6ab3d
am: f5f908c525

Change-Id: I9fe744ec118df8e68616d72f2c26db612b2b49a0