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

Change-Id: I39a25be33486fde7a2a058f79a3f110e6cce8f8a