Updated from global requirements

Change-Id: I26478513314d619d73aff9874757e7c57c6a15b9