Updated from global requirements

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