Updated from global requirements

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