More BEAST remediation

Change-Id: I2c328642d485b73355db615721cb46e84bbb2f1f