Updated from global requirements

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