Updated from global requirements

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