Updated from global requirements

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