Changes for ASOB (Probam)

Change-Id: I449224ab6f3ef7e46eb2988d327d81de93d82898