Add override setting according compliance test result. Change-Id: I965c8d500d1ef6cf332372a9e6b1e6b32f5e2a34