Strict liasing Fix

Change-Id: I09ea0b803157fd36216a23f8336e31273cf8bb71