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

Change-Id: I15004a7df3d922ba50d187769299723e888febae