Updated from global requirements

Change-Id: I7b2a507f98acc23e612c359675fb3080c256e0a3
Merge "Updated from global requirements"