[Fixed] Mantis 4345

Change-Id: Ib1dbf7889fcd1defe1eb5f30d627d6f6d293904d
[fixed] haveconsent sui revokes consent

Change-Id: Ia5886e082027a60fb0e253eb01066e45fdf54e7c
Merge "[Fixed] Mantis 4345" into unstable
Merge "[fixed] haveconsent sui revokes consent" into unstable