Updated from global requirements

Change-Id: I364ac4f5d90a2826523d629cc0bfe37ed1e8e17f