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

Change-Id: I0f0525480e9d28142cb5ee375f834a21e6121f31