Updated from global requirements

Change-Id: Ideaa82a543577818a364d3a6017ae0ab44887023