Merge "cleanup deprecated lingering code for otasp"
am: 371b9b0d6e

Change-Id: I2fee96573335b3b7f215e670ffcd5b21088d8d88