Updated from global requirements

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