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

Change-Id: I68f94410a0aa67203a81e4e334e174babd544951