Updated from global requirements

Change-Id: I02454508080efe8c79fac4cfebe83585b75121ac
Merge "Updated from global requirements"