Updated from global requirements

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