Merge "Revert angle classifier relaxation" into pi-dev
am: 1119605853

Change-Id: Ifdca897151193c834860d0ff13f5d50b13c7c22c