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

Change-Id: If2c15fe65e30a333cf78aa1456cc7dec2fe5ebfa