Updated from global requirements

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