Merge "otasp refactor" am: 8538b04bfe am: 519c2ab769
am: ba86bc6a26

Change-Id: If972045b9975c75bb892b462ae3cb886f2a39010