Updated from global requirements

Change-Id: I8b9cbdb3032e5a345b46c49acc9f28b5ed5a6687