Merge "update sim activation state for otasp" am: 6b784f4c92 am: 046fdb7d99 am: 774dfb7212
am: 6b7498999a

Change-Id: I098a6796f025e02b6800e22df61b15f4766ff098