Updated from global requirements

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