Updated from global requirements

Change-Id: Ib4e518a375e1fc5b57e21449de20d02e0eaac2c5