Updated from global requirements

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