Updated from global requirements

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