Updated from global requirements

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