Merge "otasp refactor"
am: 8538b04bfe

Change-Id: I83df33f71ee04fa6504fb261730e00aff00b0421