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

Change-Id: Ifecae8d7151c8e98cfb20d881686f704b4c67ccf