Updated from global requirements

Change-Id: I81b3b570722c90558d92c75979d80a5eadf7d8e0